Bring in more header ordering and modernization. Collapse in work to

simplify (C++-11-isze) some of the pretentious loop iterators in GeoJSON
and some of the silly ones elsewhere. Probably lots more to do.

diff --git a/g7towin.cc b/g7towin.cc
index 983af41d8640812367a5ddbbef70ebca2cc049ab..775de5a6694d397f36d1f3d80ecbd5d368bb7824 100644 (file)
--- a/g7towin.cc
+++ b/g7towin.cc
@@ -32,9 +32,9 @@
 #include "jeeps/gpsmath.h"
 #include "strptime.h"
 
+#include <cstdio>
 #include <cstdlib>
 #include <ctime>
-#include <cstdio>
 
 #if CSVFMTS_ENABLED
 

diff --git a/garmin.cc b/garmin.cc
index 7d82feed8f722efd3a7e41d2935b66add06063b5..ee539be15c7020f43d515ee64aca6c5e79ced619 100644 (file)
--- a/garmin.cc
+++ b/garmin.cc
@@ -1108,8 +1108,8 @@ route_waypt_pr(const Waypoint* wpt)
   // This was strncpy(rte->ident, wpt->shortname, sizeof(rte->ident));
   char* d;
   d = rte->ident;
-  for (int idx = 0; idx < wpt->shortname.length(); idx++) {
-    int c = wpt->shortname[idx].toLatin1();
+  for (auto idx : wpt->shortname) {
+    int c = idx.toLatin1();
     if (receiver_must_upper && isalpha(c)) {
       c = toupper(c);
     }

diff --git a/geojson.cc b/geojson.cc
index a960fe7b93d6565d7f963f75540f6668c9682181..3c6ba559ace72fcccf25d7c14fbf277d60f5886e 100644 (file)
--- a/geojson.cc
+++ b/geojson.cc
@@ -145,14 +145,14 @@ waypoint_from_coordinates(const QJsonArray& coordinates)
 static void 
 routes_from_polygon_coordinates(const QJsonArray& polygon)
 {
-       for (auto lineStringIterator = polygon.begin(); lineStringIterator != polygon.end(); ++lineStringIterator)
+       for (auto && lineStringIterator : polygon)
        {
-               QJsonArray coordinates = (*lineStringIterator).toArray();
+               QJsonArray coordinates = (lineStringIterator).toArray();
                auto route = route_head_alloc();
                route_add_head(route);
-               for (auto coordinates_iterator = coordinates.begin(); coordinates_iterator != coordinates.end(); ++coordinates_iterator)
+               for (auto && coordinate : coordinates)
                {
-                       auto waypoint = waypoint_from_coordinates((*coordinates_iterator).toArray());
+                       auto waypoint = waypoint_from_coordinates(coordinate.toArray());
                        route_add_wpt(route, waypoint);
                }
        }
@@ -174,9 +174,9 @@ geojson_read() {
                return;
        }
        QJsonArray features = rootObject.value(FEATURES).toArray();
-       for (auto iterator = features.begin(); iterator != features.end(); ++iterator)
+       for (auto && iterator : features)
        {
-               QJsonObject feature = (*iterator).toObject();
+               QJsonObject feature = iterator.toObject();
                QJsonObject properties = (feature.value(PROPERTIES)).toObject();
                QString name;
                QString description;
@@ -218,9 +218,9 @@ geojson_read() {
                else if (geometry_type == MULTIPOINT)
                {
                        QJsonArray coordinates = geometry.value(COORDINATES).toArray();
-                       for (auto coordinates_iterator = coordinates.begin(); coordinates_iterator != coordinates.end(); ++coordinates_iterator)
+                       for (auto && coordinate : coordinates)
                        {
-                               auto waypoint = waypoint_from_coordinates((*coordinates_iterator).toArray());
+                               auto waypoint = waypoint_from_coordinates(coordinate.toArray());
                                waypt_add(waypoint);
                        }
                }
@@ -230,9 +230,9 @@ geojson_read() {
                        auto route = route_head_alloc();
                        route->rte_name = name;
                        route_add_head(route);
-                       for (auto coordinates_iterator = coordinates.begin(); coordinates_iterator != coordinates.end(); ++coordinates_iterator)
+                       for (auto && coordinate : coordinates)
                        {
-                               auto waypoint = waypoint_from_coordinates((*coordinates_iterator).toArray());
+                               auto waypoint = waypoint_from_coordinates(coordinate.toArray());
                                route_add_wpt(route, waypoint);
                        }
                }
@@ -244,23 +244,23 @@ geojson_read() {
                else if (geometry_type == MULTIPOLYGON)
                {
                        QJsonArray polygons = geometry.value(COORDINATES).toArray();
-                       for (auto polygons_iterator = polygons.begin(); polygons_iterator != polygons.end(); ++polygons_iterator)
+                       for (auto && polygons_iterator : polygons)
                        {
-                               QJsonArray polygon = (*polygons_iterator).toArray();
+                               QJsonArray polygon = polygons_iterator.toArray();
                                routes_from_polygon_coordinates(polygon);
                        }
                }
                else if (geometry_type == MULTILINESTRING)
                {
                        QJsonArray line_strings = geometry.value(COORDINATES).toArray();
-                       for (auto lineStringIterator = line_strings.begin(); lineStringIterator != line_strings.end(); ++lineStringIterator)
+                       for (auto && line_string : line_strings)
                        {
-                               QJsonArray coordinates = (*lineStringIterator).toArray();
+                               QJsonArray coordinates = line_string.toArray();
                                auto route = route_head_alloc();
                                track_add_head(route);
-                               for (auto coordinates_iterator = coordinates.begin(); coordinates_iterator != coordinates.end(); ++coordinates_iterator)
+                               for (auto && coordinate : coordinates)
                                {
-                                       auto waypoint = waypoint_from_coordinates((*coordinates_iterator).toArray());
+                                       auto waypoint = waypoint_from_coordinates(coordinate.toArray());
                                        route_add_wpt(route, waypoint);
                                }
                        }

diff --git a/gopal.cc b/gopal.cc
index 603d1750bcf7448b86c32f562e70b740a4f6fb16..417f6d8c028dc6c7aca7c6186b7f645ce47c92c1 100644 (file)
--- a/gopal.cc
+++ b/gopal.cc
@@ -54,11 +54,11 @@
 #include "grtcirc.h"
 #include "jeeps/gpsmath.h"
 #include "strptime.h"
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
 #include <cmath>
 #include <cstdio>
 #include <cstdlib>
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
 
 #define MYNAME "gopal"
 

diff --git a/gpx.cc b/gpx.cc
index 0d022de0b82bfb6af1243c81b1dabb3206afd145..62500ec98af7ce0db0d605c43bb68b448b9ce335 100644 (file)
--- a/gpx.cc
+++ b/gpx.cc
@@ -463,9 +463,9 @@ tag_gpx(const QXmlStreamAttributes& attr)
    * that use them to the writer.
    */
   const QXmlStreamNamespaceDeclarations ns = reader->namespaceDeclarations();
-  for (int i = 0; i < ns.size(); ++i) {
-    QString prefix = ns[i].prefix().toString();
-    QString namespaceUri = ns[i].namespaceUri().toString();
+  for (const auto & n : ns) {
+    QString prefix = n.prefix().toString();
+    QString namespaceUri = n.namespaceUri().toString();
     /* don't toss any xsi declaration, it might used for tt_unknown or passthrough. */
     if (!prefix.isEmpty()) {
       if (! gpx_namespace_attribute.hasAttribute(prefix.prepend("xmlns:"))) {

diff --git a/ozi.cc b/ozi.cc
index eb7b81091bc4c4fe42ca68adb30362a1b6093ca6..aae50524157d12473361f1798a0ab291f5b17bd9 100644 (file)
--- a/ozi.cc
+++ b/ozi.cc
@@ -27,10 +27,10 @@
 #include "csv_util.h"
 #include "jeeps/gpsmath.h"
 #include <QtCore/QFileInfo>
+#include <cctype>
 #include <cmath>                /* for floor */
 #include <cstdio>
 #include <cstdlib>
-#include <cctype>
 
 #define MYNAME        "OZI"
 #define BADCHARS       ",\r\n"

diff --git a/raymarine.cc b/raymarine.cc
index 0ab9673a272f68a46a99914970dd451c718c3b23..803e84afdd389032b1af68baff4f67977bae945c 100644 (file)
--- a/raymarine.cc
+++ b/raymarine.cc
@@ -419,8 +419,8 @@ write_route_wpt_cb(const Waypoint* wpt)
   };
 
   gbfprintf(fout, "Mk%d=%s" LINE_FEED, rte_wpt_index, (char*)wpt->extra_data);
-  for (unsigned i = 0; i < sizeof(items) / sizeof(char*); i++) {
-    gbfprintf(fout, "%s%d=%.15f" LINE_FEED, items[i], rte_wpt_index, 0.0);
+  for (auto & item : items) {
+    gbfprintf(fout, "%s%d=%.15f" LINE_FEED, item, rte_wpt_index, 0.0);
   }
 
   rte_wpt_index++;